(PUP-11752) fqdn_rand_string_spec.rb relies on legacy fqdn fact #1294
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smortex
reviewed
Feb 7, 2023
There could potentially be other modules that are impacted too
joshcooper
reviewed
Feb 8, 2023
| @@ -57,7 +57,7 @@ def fqdn_rand_string(max, args = {}) | |||
|
|
|||
| # workaround not being able to use let(:facts) because some tests need | |||
| # multiple different hostnames in one context | |||
| allow(scope).to receive(:lookupvar).with('::fqdn', {}).and_return(host) | |||
| allow(scope).to receive(:lookupvar).with('facts', {}).and_return({ 'networking' => { 'fqdn' => host } }) | |||
There was a problem hiding this comment.
Ah the expectation needs to be different based on the version of puppet (before and after this change puppetlabs/puppet@c0d2560). So something like
if Puppet::PUPPETVERSION.to_f < 7.23
allow(scope).to receive(:lookupvar).with('::fqdn', {}).and_return(host)
else
allow(scope).to receive(:lookupvar).with('facts', {}).and_return({ 'networking' => { 'fqdn' => host } })
endOr there may be a better way to stub out the facts using RspecPuppetFacts?
There was a problem hiding this comment.
Perhaps this function should just mock fqdn_rand? It really is fqdn_rand which gets the fact, so we don't care about the internal implementation:
|
|
This was referenced Apr 20, 2023
alexjfisher
added a commit
to alexjfisher/puppetlabs-stdlib
that referenced
this pull request
Apr 21, 2023
Since Puppet `7.23.0` `fqdn_rand` uses the modern structured `networking` fact instead of the legacy `fqdn` fact. In this commit we mock the new fact if using `7.23.0` or later. This is a rebase of puppetlabs#1294 and incorporates Aria Li's original change and a variation on Josh Cooper's suggestion for keeping compatibility with Puppet < `7.23.0`
|
PR #1308 was merged and supersedes this work, so closing this PR. |
b4ldr
pushed a commit
to b4ldr/puppetlabs-stdlib
that referenced
this pull request
Jun 22, 2023
Since Puppet `7.23.0` `fqdn_rand` uses the modern structured `networking` fact instead of the legacy `fqdn` fact. In this commit we mock the new fact if using `7.23.0` or later. This is a rebase of puppetlabs#1294 and incorporates Aria Li's original change and a variation on Josh Cooper's suggestion for keeping compatibility with Puppet < `7.23.0`
cegeka-jenkins
pushed a commit
to cegeka/puppet-stdlib
that referenced
this pull request
Feb 21, 2024
Since Puppet `7.23.0` `fqdn_rand` uses the modern structured `networking` fact instead of the legacy `fqdn` fact. In this commit we mock the new fact if using `7.23.0` or later. This is a rebase of puppetlabs/puppetlabs-stdlib#1294 and incorporates Aria Li's original change and a variation on Josh Cooper's suggestion for keeping compatibility with Puppet < `7.23.0`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.